bitkeeper revision 1.994.1.7 (40d86324dX6OPOXf6BKpjF4lrFQE0g)

ui tweak

diff --git a/tools/examples/xc_dom_control.py b/tools/examples/xc_dom_control.py
index 583d629c7442986ccbe6e6990246f8eb5a8c9e87..998c85688124560d76184e51995c5831c540f660 100755 (executable)
--- a/tools/examples/xc_dom_control.py
+++ b/tools/examples/xc_dom_control.py
@@ -88,11 +88,11 @@ elif cmd == 'list':
     print 'Dom  Name             Mem(kb)  CPU  State  Time(ms)'
     for domain in xc.domain_getinfo():
 
-       run   = (domain['running'] and 'r') or '-'
-        block = (domain['blocked'] and 'b') or '-'
-       stop  = (domain['paused']  and 'p') or '-'
-       susp  = (domain['shutdown'] and 's') or '-'
-       crash = (domain['crashed'] and 'c') or '-'
+       run   = (domain['running'] and 'R') or 'r'
+        block = (domain['blocked'] and 'B') or 'b'
+       stop  = (domain['paused']  and 'P') or 'p'
+       susp  = (domain['shutdown'] and 'S') or 's'
+       crash = (domain['crashed'] and 'C') or 'c'
 
         domain['state'] = run + block + stop + susp + crash
         domain['cpu_time'] = domain['cpu_time']/1e6

diff --git a/tools/xenmgr/lib/XendDomainInfo.py b/tools/xenmgr/lib/XendDomainInfo.py
index c41ac73b50d4bb80b36fb0acbbcefc0840c945b1..c4c93c8d578599e70e0822d9dc6481e20ac109a3 100644 (file)
--- a/tools/xenmgr/lib/XendDomainInfo.py
+++ b/tools/xenmgr/lib/XendDomainInfo.py
@@ -111,11 +111,11 @@ class XendDomainInfo:
                 ['name', self.name],
                 ['memory', self.memory] ]
         if self.info:
-            run   = (self.info['running'] and 'r') or '-'
-            block = (self.info['blocked'] and 'b') or '-'
-            stop  = (self.info['paused']  and 'p') or '-'
-            susp  = (self.info['shutdown'] and 's') or '-'
-            crash = (self.info['crashed'] and 'c') or '-'
+            run   = (self.info['running'] and 'R') or 'r'
+            block = (self.info['blocked'] and 'B') or 'b'
+            stop  = (self.info['paused']  and 'P') or 'p'
+            susp  = (self.info['shutdown'] and 'S') or 's'
+            crash = (self.info['crashed'] and 'C') or 'c'
             state = run + block + stop + susp + crash
             sxpr.append(['cpu', self.info['cpu']])
             sxpr.append(['state', state])